From 135bc919e972555561298ba582ef7f684e61a7ff Mon Sep 17 00:00:00 2001 From: parkrrrr Date: Fri, 30 Sep 2005 20:20:26 +0000 Subject: [PATCH] Add controls option to saroute, use street names for rtept names at turns --- gpsbabel/README | 11 +- gpsbabel/reference/track/i65.anr.gpx | 3312 +++++++++++++------------- gpsbabel/saroute.c | 91 +- 3 files changed, 1748 insertions(+), 1666 deletions(-) diff --git a/gpsbabel/README b/gpsbabel/README index 683718ff2..2c6552e99 100644 --- a/gpsbabel/README +++ b/gpsbabel/README @@ -692,7 +692,16 @@ THE FORMATS reasons, 'split' cannot be used at the same time as the 'turns_only' or 'turns_important' options. - All options only apply to route files from newer versions of + The 'controls' option lets you read the control points (start, end, + vias, and stops) for your route as well as the route itself. The + default for this option is 'none', which won't read the control + points. You may also specify 'waypoints', which reads the control + points as waypoints, or 'route', which creates an extra route named + 'control points' containing just the control points in order. Note + that if your goal is to create an arc or other CSV file, you should + use 'none' (or not use this option, which is the same thing.) + + All options only apply to route files from newer (anr) versions of DeLorme software; older versions didn't store the turn information with the route. diff --git a/gpsbabel/reference/track/i65.anr.gpx b/gpsbabel/reference/track/i65.anr.gpx index 041709c92..f6788b614 100644 --- a/gpsbabel/reference/track/i65.anr.gpx +++ b/gpsbabel/reference/track/i65.anr.gpx @@ -1,4971 +1,4971 @@ - + - - + + Home to 8520 Northwe + Local Road + + \00000 \00001 - + \00002 \00003 - - \00004 - - \00005 + \00004 - \00006 + I-65 N - \00007 + \00005 - \00008 + \00006 - \00009 + \00007 - \0000a + \00008 - \0000b + \00009 - \0000c + \0000a - \0000d + \0000b - \0000e + \0000c - \0000f + \0000d - \00010 + \0000e - \00011 + \0000f - \00012 + \00010 - \00013 + \00011 - \00014 + \00012 - \00015 + \00013 - \00016 + \00014 - \00017 + \00015 - \00018 + \00016 - \00019 + \00017 - \0001a + \00018 - \0001b + \00019 - \0001c + \0001a - \0001d + \0001b - \0001e + \0001c - \0001f + \0001d - \00020 + \0001e - \00021 + \0001f - \00022 + \00020 - \00023 + \00021 - \00024 + \00022 - \00025 + \00023 - \00026 + \00024 - \00027 + \00025 - \00028 + \00026 - \00029 + \00027 - \0002a + \00028 - \0002b + \00029 - \0002c + \0002a - \0002d + \0002b - \0002e + \0002c - \0002f + \0002d - \00030 + \0002e - \00031 + \0002f - \00032 + \00030 - \00033 + \00031 - \00034 + \00032 - \00035 + \00033 - \00036 + \00034 - \00037 + \00035 - \00038 + \00036 - \00039 + \00037 - \0003a + \00038 - \0003b + \00039 - \0003c + \0003a - \0003d + \0003b - \0003e + \0003c - \0003f + \0003d - \00040 + \0003e - \00041 + \0003f - \00042 + \00040 - \00043 + \00041 - \00044 + \00042 - \00045 + \00043 - \00046 + \00044 - \00047 + \00045 - \00048 + \00046 - \00049 + \00047 - \0004a + \00048 - \0004b + \00049 - \0004c + \0004a - \0004d + \0004b - \0004e + \0004c - \0004f + \0004d - \00050 + \0004e - \00051 + \0004f - \00052 + \00050 - \00053 + \00051 - \00054 + \00052 - \00055 + \00053 - \00056 + \00054 - \00057 + \00055 - \00058 + \00056 - \00059 + \00057 - \0005a + \00058 - \0005b + \00059 - \0005c + \0005a - \0005d + \0005b - \0005e + \0005c - \0005f + \0005d - \00060 + \0005e - \00061 + \0005f - \00062 + \00060 - \00063 + \00061 - \00064 + \00062 - \00065 + \00063 - \00066 + \00064 - \00067 + \00065 - \00068 + \00066 - \00069 + \00067 - \0006a + \00068 - \0006b + \00069 - \0006c + \0006a - \0006d + \0006b - \0006e + I-40 E (I-65 N) Ramp - \0006f + \0006c - \00070 + \0006d - \00071 + \0006e - \00072 + I-40 E (I-65 N) - \00073 + \0006f - \00074 + \00070 - \00075 + \00071 - \00076 + \00072 - \00077 + \00073 - \00078 + \00074 - \00079 + \00075 - \0007a + \00076 - \0007b + \00077 - \0007c + \00078 - \0007d + I-24 W (I-65 N) Ramp - \0007e + \00079 - \0007f + \0007a - \00080 + \0007b - \00081 + \0007c - \00082 + \0007d - \00083 + I-24 W (I-65 N) - \00084 + \0007e - \00085 + \0007f - \00086 + \00080 - \00087 + \00081 - \00088 + \00082 - \00089 + \00083 - \0008a + \00084 - \0008b + \00085 - \0008c + \00086 - \0008d + \00087 - \0008e + \00088 - \0008f + \00089 - \00090 + \0008a - \00091 + \0008b - \00092 + \0008c - \00093 + \0008d - \00094 + \0008e - \00095 + \0008f - \00096 + \00090 - \00097 + \00091 - \00098 + \00092 - \00099 + \00093 - \0009a + \00094 - \0009b + \00095 - \0009c + \00096 - \0009d + \00097 - \0009e + \00098 - \0009f + \00099 - \000a0 + \0009a - \000a1 + \0009b - \000a2 + \0009c - \000a3 + \0009d - \000a4 + \0009e - \000a5 + \0009f - \000a6 + \000a0 - \000a7 + \000a1 - \000a8 + \000a2 - \000a9 + \000a3 - \000aa + \000a4 - \000ab + \000a5 - \000ac + \000a6 - \000ad + I-65 N - \000ae + \000a7 - \000af + \000a8 - \000b0 + \000a9 - \000b1 + \000aa - \000b2 + \000ab - \000b3 + \000ac - \000b4 + \000ad - \000b5 + \000ae - \000b6 + \000af - \000b7 + \000b0 - \000b8 + \000b1 - \000b9 + \000b2 - \000ba + \000b3 - \000bb + \000b4 - \000bc + \000b5 - \000bd + \000b6 - \000be + \000b7 - \000bf + \000b8 - \000c0 + \000b9 - \000c1 + \000ba - \000c2 + \000bb - \000c3 + \000bc - \000c4 + \000bd - \000c5 + \000be - \000c6 + \000bf - \000c7 + \000c0 - \000c8 + \000c1 - \000c9 + \000c2 - \000ca + \000c3 - \000cb + \000c4 - \000cc + \000c5 - \000cd + \000c6 - \000ce + \000c7 - \000cf + \000c8 - \000d0 + \000c9 - \000d1 + \000ca - \000d2 + \000cb - \000d3 + \000cc - \000d4 + \000cd - \000d5 + \000ce - \000d6 + \000cf - \000d7 + \000d0 - \000d8 + \000d1 - \000d9 + \000d2 - \000da + \000d3 - \000db + \000d4 - \000dc + \000d5 - \000dd + \000d6 - \000de + \000d7 - \000df + \000d8 - \000e0 + \000d9 - \000e1 + \000da - \000e2 + \000db - \000e3 + \000dc - \000e4 + \000dd - \000e5 + \000de - \000e6 + \000df - \000e7 + \000e0 - \000e8 + \000e1 - \000e9 + \000e2 - \000ea + \000e3 - \000eb + \000e4 - \000ec + \000e5 - \000ed + \000e6 - \000ee + \000e7 - \000ef + \000e8 - \000f0 + \000e9 - \000f1 + \000ea - \000f2 + \000eb - \000f3 + \000ec - \000f4 + \000ed - \000f5 + \000ee - \000f6 + \000ef - \000f7 + \000f0 - \000f8 + \000f1 - \000f9 + \000f2 - \000fa + \000f3 - \000fb + \000f4 - \000fc + \000f5 - \000fd + \000f6 - \000fe + \000f7 - \000ff + \000f8 - \00100 + \000f9 - \00101 + \000fa - \00102 + \000fb - \00103 + \000fc - \00104 + \000fd - \00105 + \000fe - \00106 + \000ff - \00107 + \00100 - \00108 + \00101 - \00109 + \00102 - \0010a + \00103 - \0010b + \00104 - \0010c + \00105 - \0010d + \00106 - \0010e + \00107 - \0010f + \00108 - \00110 + \00109 - \00111 + \0010a - \00112 + \0010b - \00113 + \0010c - \00114 + \0010d - \00115 + \0010e - \00116 + \0010f - \00117 + \00110 - \00118 + \00111 - \00119 + \00112 - \0011a + \00113 - \0011b + \00114 - \0011c + \00115 - \0011d + \00116 - \0011e + \00117 - \0011f + \00118 - \00120 + \00119 - \00121 + \0011a - \00122 + \0011b - \00123 + \0011c - \00124 + \0011d - \00125 + \0011e - \00126 + \0011f - \00127 + \00120 - \00128 + \00121 - \00129 + \00122 - \0012a + \00123 - \0012b + \00124 - \0012c + \00125 - \0012d + \00126 - \0012e + \00127 - \0012f + \00128 - \00130 + \00129 - \00131 + \0012a - \00132 + \0012b - \00133 + \0012c - \00134 + \0012d - \00135 + \0012e - \00136 + \0012f - \00137 + \00130 - \00138 + \00131 - \00139 + \00132 - \0013a + \00133 - \0013b + \00134 - \0013c + \00135 - \0013d + \00136 - \0013e + \00137 - \0013f + \00138 - \00140 + \00139 - \00141 + \0013a - \00142 + \0013b - \00143 + \0013c - \00144 + \0013d - \00145 + \0013e - \00146 + \0013f - \00147 + \00140 - \00148 + \00141 - \00149 + \00142 - \0014a + \00143 - \0014b + \00144 - \0014c + \00145 - \0014d + \00146 - \0014e + \00147 - \0014f + \00148 - \00150 + \00149 - \00151 + \0014a - \00152 + \0014b - \00153 + \0014c - \00154 + \0014d - \00155 + \0014e - \00156 + \0014f - \00157 + \00150 - \00158 + \00151 - \00159 + \00152 - \0015a + \00153 - \0015b + \00154 - \0015c + \00155 - \0015d + \00156 - \0015e + \00157 - \0015f + \00158 - \00160 + \00159 - \00161 + \0015a - \00162 + \0015b - \00163 + \0015c - \00164 + \0015d - \00165 + \0015e - \00166 + \0015f - \00167 + \00160 - \00168 + \00161 - \00169 + \00162 - \0016a + \00163 - \0016b + \00164 - \0016c + \00165 - \0016d + \00166 - \0016e + \00167 - \0016f + \00168 - \00170 + \00169 - \00171 + \0016a - \00172 + \0016b - \00173 + \0016c - \00174 + \0016d - \00175 + \0016e - \00176 + \0016f - \00177 + \00170 - \00178 + \00171 - \00179 + \00172 - \0017a + \00173 - \0017b + \00174 - \0017c + \00175 - \0017d + \00176 - \0017e + \00177 - \0017f + \00178 - \00180 + \00179 - \00181 + \0017a - \00182 + \0017b - \00183 + \0017c - \00184 + \0017d - \00185 + \0017e - \00186 + \0017f - \00187 + \00180 - \00188 + \00181 - \00189 + \00182 - \0018a + \00183 - \0018b + \00184 - \0018c + \00185 - \0018d + \00186 - \0018e + \00187 - \0018f + \00188 - \00190 + \00189 - \00191 + \0018a - \00192 + \0018b - \00193 + \0018c - \00194 + \0018d - \00195 + \0018e - \00196 + \0018f - \00197 + \00190 - \00198 + \00191 - \00199 + \00192 - \0019a + \00193 - \0019b + \00194 - \0019c + \00195 - \0019d + \00196 - \0019e + \00197 - \0019f + \00198 - \001a0 + \00199 - \001a1 + \0019a - \001a2 + \0019b - \001a3 + \0019c - \001a4 + \0019d - \001a5 + \0019e - \001a6 + \0019f - \001a7 + \001a0 - \001a8 + \001a1 - \001a9 + \001a2 - \001aa + \001a3 - \001ab + \001a4 - \001ac + \001a5 - \001ad + \001a6 - \001ae + \001a7 - \001af + \001a8 - \001b0 + \001a9 - \001b1 + \001aa - \001b2 + \001ab - \001b3 + \001ac - \001b4 + \001ad - \001b5 + \001ae - \001b6 + \001af - \001b7 + \001b0 - \001b8 + \001b1 - \001b9 + \001b2 - \001ba + \001b3 - \001bb + \001b4 - \001bc + \001b5 - \001bd + \001b6 - \001be + \001b7 - \001bf + \001b8 - \001c0 + \001b9 - \001c1 + \001ba - \001c2 + \001bb - \001c3 + \001bc - \001c4 + \001bd - \001c5 + \001be - \001c6 + \001bf - \001c7 + \001c0 - \001c8 + \001c1 - \001c9 + \001c2 - \001ca + \001c3 - \001cb + \001c4 - \001cc + \001c5 - \001cd + \001c6 - \001ce + \001c7 - \001cf + \001c8 - \001d0 + \001c9 - \001d1 + \001ca - \001d2 + \001cb - \001d3 + \001cc - \001d4 + \001cd - \001d5 + \001ce - \001d6 + \001cf - \001d7 + \001d0 - \001d8 + \001d1 - \001d9 + \001d2 - \001da + \001d3 - \001db + \001d4 - \001dc + \001d5 - \001dd + \001d6 - \001de + \001d7 - \001df + \001d8 - \001e0 + \001d9 - \001e1 + \001da - \001e2 + \001db - \001e3 + \001dc - \001e4 + \001dd - \001e5 + \001de - \001e6 + \001df - \001e7 + \001e0 - \001e8 + \001e1 - \001e9 + \001e2 - \001ea + \001e3 - \001eb + \001e4 - \001ec + \001e5 - \001ed + \001e6 - \001ee + \001e7 - \001ef + \001e8 - \001f0 + \001e9 - \001f1 + \001ea - \001f2 + \001eb - \001f3 + \001ec - \001f4 + \001ed - \001f5 + \001ee - \001f6 + \001ef - \001f7 + \001f0 - \001f8 + \001f1 - \001f9 + \001f2 - \001fa + \001f3 - \001fb + \001f4 - \001fc + \001f5 - \001fd + \001f6 - \001fe + \001f7 - \001ff + \001f8 - \00200 + \001f9 - \00201 + \001fa - \00202 + \001fb - \00203 + \001fc - \00204 + \001fd - \00205 + \001fe - \00206 + \001ff - \00207 + \00200 - \00208 + \00201 - \00209 + \00202 - \0020a + \00203 - \0020b + \00204 - \0020c + \00205 - \0020d + \00206 - \0020e + \00207 - \0020f + \00208 - \00210 + \00209 - \00211 + \0020a - \00212 + \0020b - \00213 + \0020c - \00214 + \0020d - \00215 + \0020e - \00216 + \0020f - \00217 + \00210 - \00218 + \00211 - \00219 + \00212 - \0021a + \00213 - \0021b + \00214 - \0021c + \00215 - \0021d + \00216 - \0021e + \00217 - \0021f + \00218 - \00220 + \00219 - \00221 + \0021a - \00222 + \0021b - \00223 + \0021c - \00224 + \0021d - \00225 + \0021e - \00226 + \0021f - \00227 + \00220 - \00228 + \00221 - \00229 + \00222 - \0022a + \00223 - \0022b + \00224 - \0022c + \00225 - \0022d + \00226 - \0022e + \00227 - \0022f + \00228 - \00230 + \00229 - \00231 + \0022a - \00232 + \0022b - \00233 + \0022c - \00234 + \0022d - \00235 + \0022e - \00236 + \0022f - \00237 + \00230 - \00238 + \00231 - \00239 + \00232 - \0023a + \00233 - \0023b + \00234 - \0023c + \00235 - \0023d + \00236 - \0023e + \00237 - \0023f + \00238 - \00240 + \00239 - \00241 + \0023a - \00242 + \0023b - \00243 + \0023c - \00244 + \0023d - \00245 + \0023e - \00246 + \0023f - \00247 + \00240 - \00248 + \00241 - \00249 + \00242 - \0024a + \00243 - \0024b + \00244 - \0024c + \00245 - \0024d + \00246 - \0024e + \00247 - \0024f + \00248 - \00250 + \00249 - \00251 + \0024a - \00252 + \0024b - \00253 + \0024c - \00254 + \0024d - \00255 + \0024e - \00256 + \0024f - \00257 + \00250 - \00258 + \00251 - \00259 + \00252 - \0025a + \00253 - \0025b + \00254 - \0025c + \00255 - \0025d + \00256 - \0025e + \00257 - \0025f + \00258 - \00260 + \00259 - \00261 + \0025a - \00262 + \0025b - \00263 + \0025c - \00264 + \0025d - \00265 + \0025e - \00266 + \0025f - \00267 + \00260 - \00268 + \00261 - \00269 + \00262 - \0026a + \00263 - \0026b + \00264 - \0026c + \00265 - \0026d + \00266 - \0026e + \00267 - \0026f + \00268 - \00270 + \00269 - \00271 + \0026a - \00272 + \0026b - \00273 + \0026c - \00274 + \0026d - \00275 + \0026e - \00276 + \0026f - \00277 + \00270 - \00278 + \00271 - \00279 + \00272 - \0027a + \00273 - \0027b + \00274 - \0027c + \00275 - \0027d + \00276 - \0027e + \00277 - \0027f + \00278 - \00280 + \00279 - \00281 + \0027a - \00282 + \0027b - \00283 + \0027c - \00284 + \0027d - \00285 + \0027e - \00286 + \0027f - \00287 + \00280 - \00288 + \00281 - \00289 + \00282 - \0028a + \00283 - \0028b + \00284 - \0028c + \00285 - \0028d + \00286 - \0028e + \00287 - \0028f + \00288 - \00290 + \00289 - \00291 + \0028a - \00292 + \0028b - \00293 + \0028c - \00294 + \0028d - \00295 + \0028e - \00296 + \0028f - \00297 + \00290 - \00298 + \00291 - \00299 + \00292 - \0029a + \00293 - \0029b + \00294 - \0029c + \00295 - \0029d + \00296 - \0029e + \00297 - \0029f + \00298 - \002a0 + \00299 - \002a1 + \0029a - \002a2 + \0029b - \002a3 + \0029c - \002a4 + \0029d - \002a5 + \0029e - \002a6 + \0029f - \002a7 + \002a0 - \002a8 + \002a1 - \002a9 + \002a2 - \002aa + \002a3 - \002ab + \002a4 - \002ac + \002a5 - \002ad + \002a6 - \002ae + \002a7 - \002af + \002a8 - \002b0 + \002a9 - \002b1 + \002aa - \002b2 + \002ab - \002b3 + \002ac - \002b4 + \002ad - \002b5 + \002ae - \002b6 + \002af - \002b7 + \002b0 - \002b8 + \002b1 - \002b9 + \002b2 - \002ba + \002b3 - \002bb + \002b4 - \002bc + \002b5 - \002bd + \002b6 - \002be + \002b7 - \002bf + \002b8 - \002c0 + \002b9 - \002c1 + \002ba - \002c2 + \002bb - \002c3 + \002bc - \002c4 + \002bd - \002c5 + \002be - \002c6 + \002bf - \002c7 + \002c0 - \002c8 + \002c1 - \002c9 + \002c2 - \002ca + \002c3 - \002cb + \002c4 - \002cc + \002c5 - \002cd + \002c6 - \002ce + \002c7 - \002cf + \002c8 - \002d0 + \002c9 - \002d1 + \002ca - \002d2 + \002cb - \002d3 + \002cc - \002d4 + \002cd - \002d5 + \002ce - \002d6 + \002cf - \002d7 + \002d0 - \002d8 + \002d1 - \002d9 + \002d2 - \002da + \002d3 - \002db + \002d4 - \002dc + \002d5 - \002dd + \002d6 - \002de + \002d7 - \002df + \002d8 - \002e0 + \002d9 - \002e1 + \002da - \002e2 + \002db - \002e3 + \002dc - \002e4 + \002dd - \002e5 + \002de - \002e6 + \002df - \002e7 + \002e0 - \002e8 + \002e1 - \002e9 + \002e2 - \002ea + \002e3 - \002eb + \002e4 - \002ec + \002e5 - \002ed + \002e6 - \002ee + \002e7 - \002ef + \002e8 - \002f0 + \002e9 - \002f1 + \002ea - \002f2 + \002eb - \002f3 + \002ec - \002f4 + \002ed - \002f5 + \002ee - \002f6 + \002ef - \002f7 + \002f0 - \002f8 + \002f1 - \002f9 + \002f2 - \002fa + \002f3 - \002fb + \002f4 - \002fc + \002f5 - \002fd + \002f6 - \002fe + \002f7 - \002ff + \002f8 - \00300 + \002f9 - \00301 + \002fa - \00302 + \002fb - \00303 + \002fc - \00304 + \002fd - \00305 + \002fe - \00306 + \002ff - \00307 + \00300 - \00308 + \00301 - \00309 + \00302 - \0030a + \00303 - \0030b + \00304 - \0030c + \00305 - \0030d + \00306 - \0030e + \00307 - \0030f + \00308 - \00310 + \00309 - \00311 + \0030a - \00312 + \0030b - \00313 + \0030c - \00314 + \0030d - \00315 + \0030e - \00316 + \0030f - \00317 + \00310 - \00318 + \00311 - \00319 + \00312 - \0031a + \00313 - \0031b + \00314 - \0031c + \00315 - \0031d + \00316 - \0031e + \00317 - \0031f + \00318 - \00320 + \00319 - \00321 + \0031a - \00322 + \0031b - \00323 + \0031c - \00324 + \0031d - \00325 + \0031e - \00326 + \0031f - \00327 + \00320 - \00328 + \00321 - \00329 + \00322 - \0032a + \00323 - \0032b + \00324 - \0032c + \00325 - \0032d + \00326 - \0032e + \00327 - \0032f + \00328 - \00330 + \00329 - \00331 + \0032a - \00332 + \0032b - \00333 + \0032c - \00334 + \0032d - \00335 + \0032e - \00336 + \0032f - \00337 + \00330 - \00338 + \00331 - \00339 + \00332 - \0033a + \00333 - \0033b + \00334 - \0033c + \00335 - \0033d + \00336 - \0033e + \00337 - \0033f + \00338 - \00340 + \00339 - \00341 + \0033a - \00342 + \0033b - \00343 + \0033c - \00344 + \0033d - \00345 + \0033e - \00346 + \0033f - \00347 + \00340 - \00348 + \00341 - \00349 + \00342 - \0034a + \00343 - \0034b + \00344 - \0034c + \00345 - \0034d + \00346 - \0034e + \00347 - \0034f + \00348 - \00350 + \00349 - \00351 + \0034a - \00352 + \0034b - \00353 + \0034c - \00354 + \0034d - \00355 + \0034e - \00356 + \0034f - \00357 + \00350 - \00358 + \00351 - \00359 + \00352 - \0035a + \00353 - \0035b + \00354 - \0035c + \00355 - \0035d + \00356 - \0035e + \00357 - \0035f + \00358 - \00360 + \00359 - \00361 + \0035a - \00362 + \0035b - \00363 + \0035c - \00364 + \0035d - \00365 + \0035e - \00366 + \0035f - \00367 + \00360 - \00368 + \00361 - \00369 + \00362 - \0036a + \00363 - \0036b + \00364 - \0036c + \00365 - \0036d + \00366 - \0036e + \00367 - \0036f + \00368 - \00370 + \00369 - \00371 + \0036a - \00372 + \0036b - \00373 + \0036c - \00374 + \0036d - \00375 + \0036e - \00376 + \0036f - \00377 + \00370 - \00378 + \00371 - \00379 + \00372 - \0037a + \00373 - \0037b + \00374 - \0037c + \00375 - \0037d + \00376 - \0037e + \00377 - \0037f + \00378 - \00380 + \00379 - \00381 + \0037a - \00382 + \0037b - \00383 + \0037c - \00384 + \0037d - \00385 + \0037e - \00386 + \0037f - \00387 + \00380 - \00388 + \00381 - \00389 + \00382 - \0038a + \00383 - \0038b + \00384 - \0038c + \00385 - \0038d + \00386 - \0038e + \00387 - \0038f + \00388 - \00390 + \00389 - \00391 + \0038a - \00392 + \0038b - \00393 + \0038c - \00394 + \0038d - \00395 + \0038e - \00396 + \0038f - \00397 + \00390 - \00398 + \00391 - \00399 + \00392 - \0039a + \00393 - \0039b + \00394 - \0039c + \00395 - \0039d + \00396 - \0039e + \00397 - \0039f + \00398 - \003a0 + \00399 - \003a1 + \0039a - \003a2 + \0039b - \003a3 + \0039c - \003a4 + \0039d - \003a5 + \0039e - \003a6 + \0039f - \003a7 + \003a0 - \003a8 + \003a1 - \003a9 + \003a2 - \003aa + \003a3 - \003ab + \003a4 - \003ac + \003a5 - \003ad + \003a6 - \003ae + \003a7 - \003af + \003a8 - \003b0 + \003a9 - \003b1 + \003aa - \003b2 + \003ab - \003b3 + \003ac - \003b4 + \003ad - \003b5 + \003ae - \003b6 + \003af - \003b7 + \003b0 - \003b8 + \003b1 - \003b9 + \003b2 - \003ba + \003b3 - \003bb + \003b4 - \003bc + \003b5 - \003bd + \003b6 - \003be + \003b7 - \003bf + \003b8 - \003c0 + \003b9 - \003c1 + \003ba - \003c2 + \003bb - \003c3 + \003bc - \003c4 + \003bd - \003c5 + \003be - \003c6 + \003bf - \003c7 + \003c0 - \003c8 + \003c1 - \003c9 + \003c2 - \003ca + \003c3 - \003cb + \003c4 - \003cc + \003c5 - \003cd + \003c6 - \003ce + \003c7 - \003cf + \003c8 - \003d0 + \003c9 - \003d1 + \003ca - \003d2 + \003cb - \003d3 + \003cc - \003d4 + \003cd - \003d5 + \003ce - \003d6 + \003cf - \003d7 + \003d0 - \003d8 + \003d1 - \003d9 + \003d2 - \003da + \003d3 - \003db + \003d4 - \003dc + \003d5 - \003dd + \003d6 - \003de + \003d7 - \003df + \003d8 - \003e0 + \003d9 - \003e1 + \003da - \003e2 + \003db - \003e3 + \003dc - \003e4 + \003dd - \003e5 + \003de - \003e6 + \003df - \003e7 + \003e0 - \003e8 + \003e1 - \003e9 + \003e2 - \003ea + \003e3 - \003eb + \003e4 - \003ec + \003e5 - \003ed + \003e6 - \003ee + \003e7 - \003ef + \003e8 - \003f0 + \003e9 - \003f1 + \003ea - \003f2 + \003eb - \003f3 + \003ec - \003f4 + \003ed - \003f5 + \003ee - \003f6 + \003ef - \003f7 + \003f0 - \003f8 + \003f1 - \003f9 + \003f2 - \003fa + \003f3 - \003fb + \003f4 - \003fc + \003f5 - \003fd + \003f6 - \003fe + \003f7 - \003ff + \003f8 - \00400 + \003f9 - \00401 + \003fa - \00402 + \003fb - \00403 + \003fc - \00404 + \003fd - \00405 + \003fe - \00406 + \003ff - \00407 + \00400 - \00408 + \00401 - \00409 + \00402 - \0040a + \00403 - \0040b + \00404 - \0040c + \00405 - \0040d + \00406 - \0040e + \00407 - \0040f + \00408 - \00410 + \00409 - \00411 + \0040a - \00412 + \0040b - \00413 + \0040c - \00414 + \0040d - \00415 + \0040e - \00416 + \0040f - \00417 + \00410 - \00418 + \00411 - \00419 + \00412 - \0041a + \00413 - \0041b + \00414 - \0041c + \00415 - \0041d + \00416 - \0041e + \00417 - \0041f + \00418 - \00420 + \00419 - \00421 + \0041a - \00422 + \0041b - \00423 + \0041c - \00424 + \0041d - \00425 + \0041e - \00426 + \0041f - \00427 + \00420 - \00428 + \00421 - \00429 + \00422 - \0042a + \00423 - \0042b + \00424 - \0042c + \00425 - \0042d + \00426 - \0042e + \00427 - \0042f + \00428 - \00430 + \00429 - \00431 + \0042a - \00432 + \0042b - \00433 + \0042c - \00434 + \0042d - \00435 + \0042e - \00436 + \0042f - \00437 + \00430 - \00438 + \00431 - \00439 + \00432 - \0043a + \00433 - \0043b + \00434 - \0043c + \00435 - \0043d + \00436 - \0043e + \00437 - \0043f + \00438 - \00440 + \00439 - \00441 + \0043a - \00442 + \0043b - \00443 + \0043c - \00444 + \0043d - \00445 + \0043e - \00446 + \0043f - \00447 + \00440 - \00448 + \00441 - \00449 + \00442 - \0044a + \00443 - \0044b + \00444 - \0044c + \00445 - \0044d + \00446 - \0044e + \00447 - \0044f + \00448 - \00450 + \00449 - \00451 + \0044a - \00452 + \0044b - \00453 + \0044c - \00454 + \0044d - \00455 + \0044e - \00456 + \0044f - \00457 + \00450 - \00458 + \00451 - \00459 + \00452 - \0045a + \00453 - \0045b + \00454 - \0045c + \00455 - \0045d + \00456 - \0045e + \00457 - \0045f + \00458 - \00460 + \00459 - \00461 + \0045a - \00462 + \0045b - \00463 + \0045c - \00464 + \0045d - \00465 + \0045e - \00466 + \0045f - \00467 + \00460 - \00468 + \00461 - \00469 + \00462 - \0046a + \00463 - \0046b + \00464 - \0046c + \00465 - \0046d + \00466 - \0046e + \00467 - \0046f + \00468 - \00470 + \00469 - \00471 + \0046a - \00472 + \0046b - \00473 + \0046c - \00474 + \0046d - \00475 + \0046e - \00476 + \0046f - \00477 + \00470 - \00478 + \00471 - \00479 + \00472 - \0047a + \00473 - \0047b + \00474 - \0047c + \00475 - \0047d + \00476 - \0047e + \00477 - \0047f + \00478 - \00480 + \00479 - \00481 + \0047a - \00482 + \0047b - \00483 + \0047c - \00484 + \0047d - \00485 + \0047e - \00486 + \0047f - \00487 + \00480 - \00488 + \00481 - \00489 + \00482 - \0048a + \00483 - \0048b + \00484 - \0048c + \00485 - \0048d + \00486 - \0048e + \00487 - \0048f + \00488 - \00490 + \00489 - \00491 + \0048a - \00492 + \0048b - \00493 + \0048c - \00494 + \0048d - \00495 + \0048e - \00496 + \0048f - \00497 + \00490 - \00498 + \00491 - \00499 + \00492 - \0049a + \00493 - \0049b + \00494 - \0049c + \00495 - \0049d + \00496 - \0049e + \00497 - \0049f + \00498 - \004a0 + \00499 - \004a1 + \0049a - \004a2 + \0049b - \004a3 + \0049c - \004a4 + \0049d - \004a5 + \0049e - \004a6 + \0049f - \004a7 + \004a0 - \004a8 + \004a1 - \004a9 + \004a2 - \004aa + \004a3 - \004ab + \004a4 - \004ac + \004a5 - \004ad + \004a6 - \004ae + \004a7 - \004af + \004a8 - \004b0 + \004a9 - \004b1 + \004aa - \004b2 + \004ab - \004b3 + \004ac - \004b4 + \004ad - \004b5 + \004ae - \004b6 + \004af - \004b7 + \004b0 - \004b8 + \004b1 - \004b9 + \004b2 - \004ba + \004b3 - \004bb + \004b4 - \004bc + \004b5 - \004bd + \004b6 - \004be + \004b7 - \004bf + \004b8 - \004c0 + \004b9 - \004c1 + \004ba - \004c2 + \004bb - \004c3 + \004bc - \004c4 + \004bd - \004c5 + \004be - \004c6 + \004bf - \004c7 + \004c0 - \004c8 + \004c1 - \004c9 + \004c2 - \004ca + \004c3 - \004cb + \004c4 - \004cc + \004c5 - \004cd + \004c6 - \004ce + \004c7 - \004cf + \004c8 - \004d0 + \004c9 - \004d1 + \004ca - \004d2 + \004cb - \004d3 + \004cc - \004d4 + \004cd - \004d5 + \004ce - \004d6 + \004cf - \004d7 + \004d0 - \004d8 + \004d1 - \004d9 + \004d2 - \004da + \004d3 - \004db + \004d4 - \004dc + \004d5 - \004dd + \004d6 - \004de + \004d7 - \004df + \004d8 - \004e0 + \004d9 - \004e1 + \004da - \004e2 + \004db - \004e3 + \004dc - \004e4 + \004dd - \004e5 + \004de - \004e6 + \004df - \004e7 + \004e0 - \004e8 + \004e1 - \004e9 + \004e2 - \004ea + \004e3 - \004eb + \004e4 - \004ec + \004e5 - \004ed + \004e6 - \004ee + \004e7 - \004ef + \004e8 - \004f0 + \004e9 - \004f1 + \004ea - \004f2 + \004eb - \004f3 + \004ec - \004f4 + \004ed - \004f5 + \004ee - \004f6 + \004ef - \004f7 + \004f0 - \004f8 + \004f1 - \004f9 + \004f2 - \004fa + \004f3 - \004fb + \004f4 - \004fc + \004f5 - \004fd + \004f6 - \004fe + \004f7 - \004ff + \004f8 - \00500 + \004f9 - \00501 + \004fa - \00502 + \004fb - \00503 + \004fc - \00504 + \004fd - \00505 + \004fe - \00506 + \004ff - \00507 + \00500 - \00508 + \00501 - \00509 + \00502 - \0050a + \00503 - \0050b + \00504 - \0050c + \00505 - \0050d + \00506 - \0050e + \00507 - \0050f + \00508 - \00510 + \00509 - \00511 + \0050a - \00512 + \0050b - \00513 + \0050c - \00514 + \0050d - \00515 + \0050e - \00516 + \0050f - \00517 + \00510 - \00518 + \00511 - \00519 + \00512 - \0051a + \00513 - \0051b + \00514 - \0051c + \00515 - \0051d + \00516 - \0051e + \00517 - \0051f + \00518 - \00520 + \00519 - \00521 + \0051a - \00522 + \0051b - \00523 + \0051c - \00524 + \0051d - \00525 + \0051e - \00526 + \0051f - \00527 + \00520 - \00528 + \00521 - \00529 + \00522 - \0052a + \00523 - \0052b + \00524 - \0052c + \00525 - \0052d + \00526 - \0052e + \00527 - \0052f + \00528 - \00530 + \00529 - \00531 + \0052a - \00532 + \0052b - \00533 + \0052c - \00534 + \0052d - \00535 + \0052e - \00536 + \0052f - \00537 + \00530 - \00538 + \00531 - \00539 + \00532 - \0053a + \00533 - \0053b + \00534 - \0053c + \00535 - \0053d + \00536 - \0053e + \00537 - \0053f + \00538 - \00540 + \00539 - \00541 + \0053a - \00542 + \0053b - \00543 + \0053c - \00544 + \0053d - \00545 + \0053e - \00546 + \0053f - \00547 + \00540 - \00548 + \00541 - \00549 + \00542 - \0054a + \00543 - \0054b + \00544 - \0054c + \00545 - \0054d + \00546 - \0054e + \00547 - \0054f + \00548 - \00550 + \00549 - \00551 + \0054a - \00552 + \0054b - \00553 + \0054c - \00554 + \0054d - \00555 + \0054e - \00556 + \0054f - \00557 + \00550 - \00558 + \00551 - \00559 + \00552 - \0055a + \00553 - \0055b + \00554 - \0055c + \00555 - \0055d + \00556 - \0055e + \00557 - \0055f + \00558 - \00560 + \00559 - \00561 + \0055a - \00562 + \0055b - \00563 + \0055c - \00564 + \0055d - \00565 + \0055e - \00566 + \0055f - \00567 + \00560 - \00568 + \00561 - \00569 + \00562 - \0056a + \00563 - \0056b + \00564 - \0056c + \00565 - \0056d + \00566 - \0056e + \00567 - \0056f + \00568 - \00570 + \00569 - \00571 + \0056a - \00572 + \0056b - \00573 + \0056c - \00574 + \0056d - \00575 + \0056e - \00576 + \0056f - \00577 + \00570 - \00578 + \00571 - \00579 + \00572 - \0057a + \00573 - \0057b + \00574 - \0057c + \00575 - \0057d + \00576 - \0057e + \00577 - \0057f + \00578 - \00580 + \00579 - \00581 + \0057a - \00582 + \0057b - \00583 + \0057c - \00584 + \0057d - \00585 + \0057e - \00586 + \0057f - \00587 + \00580 - \00588 + \00581 - \00589 + \00582 - \0058a + \00583 - \0058b + \00584 - \0058c + \00585 - \0058d + \00586 - \0058e + \00587 - \0058f + \00588 - \00590 + \00589 - \00591 + \0058a - \00592 + \0058b - \00593 + \0058c - \00594 + \0058d - \00595 + \0058e - \00596 + \0058f - \00597 + \00590 - \00598 + \00591 - \00599 + \00592 - \0059a + \00593 - \0059b + \00594 - \0059c + \00595 - \0059d + \00596 - \0059e + \00597 - \0059f + \00598 - \005a0 + \00599 - \005a1 + \0059a - \005a2 + \0059b - \005a3 + \0059c - \005a4 + \0059d - \005a5 + \0059e - \005a6 + \0059f - \005a7 + \005a0 - \005a8 + \005a1 - \005a9 + \005a2 - \005aa + \005a3 - \005ab + \005a4 - \005ac + \005a5 - \005ad + \005a6 - \005ae + \005a7 - \005af + \005a8 - \005b0 + \005a9 - \005b1 + \005aa - \005b2 + \005ab - \005b3 + \005ac - \005b4 + \005ad - \005b5 + \005ae - \005b6 + \005af - \005b7 + \005b0 - \005b8 + \005b1 - \005b9 + \005b2 - \005ba + \005b3 - \005bb + \005b4 - \005bc + \005b5 - \005bd + \005b6 - \005be + \005b7 - \005bf + \005b8 - \005c0 + \005b9 - \005c1 + \005ba - \005c2 + \005bb - \005c3 + \005bc - \005c4 + \005bd - \005c5 + \005be - \005c6 + \005bf - \005c7 + \005c0 - \005c8 + \005c1 - \005c9 + \005c2 - \005ca + \005c3 - \005cb + \005c4 - \005cc + \005c5 - \005cd + \005c6 - \005ce + \005c7 - \005cf + \005c8 - \005d0 + \005c9 - \005d1 + \005ca - \005d2 + \005cb - \005d3 + \005cc - \005d4 + \005cd - \005d5 + \005ce - \005d6 + \005cf - \005d7 + \005d0 - \005d8 + \005d1 - \005d9 + \005d2 - \005da + \005d3 - \005db + \005d4 - \005dc + \005d5 - \005dd + \005d6 - \005de + \005d7 - \005df + \005d8 - \005e0 + \005d9 - \005e1 + \005da - \005e2 + \005db - \005e3 + \005dc - \005e4 + \005dd - \005e5 + \005de - \005e6 + \005df - \005e7 + \005e0 - \005e8 + \005e1 - \005e9 + \005e2 - \005ea + \005e3 - \005eb + \005e4 - \005ec + \005e5 - \005ed + \005e6 - \005ee + \005e7 - \005ef + \005e8 - \005f0 + \005e9 - \005f1 + \005ea - \005f2 + \005eb - \005f3 + \005ec - \005f4 + \005ed - \005f5 + \005ee - \005f6 + \005ef - \005f7 + \005f0 - \005f8 + \005f1 - \005f9 + \005f2 - \005fa + \005f3 - \005fb + \005f4 - \005fc + \005f5 - \005fd + \005f6 - \005fe + \005f7 - \005ff + \005f8 - \00600 + \005f9 - \00601 + \005fa - \00602 + \005fb - \00603 + \005fc - \00604 + \005fd - \00605 + \005fe - \00606 + \005ff - \00607 + \00600 - \00608 + \00601 - \00609 + \00602 - \0060a + \00603 - \0060b + \00604 - \0060c + \00605 - \0060d + \00606 - \0060e + \00607 - \0060f + \00608 - \00610 + \00609 - \00611 + \0060a - \00612 + \0060b - \00613 + \0060c - \00614 + \0060d - \00615 + \0060e - \00616 + \0060f - \00617 + \00610 - \00618 + \00611 - \00619 + \00612 - \0061a + \00613 - \0061b + \00614 - \0061c + \00615 - \0061d + \00616 - \0061e + \00617 - \0061f + \00618 - \00620 + \00619 - \00621 + \0061a - \00622 + \0061b - \00623 + \0061c - \00624 + \0061d - \00625 + \0061e - \00626 + \0061f - \00627 + \00620 - \00628 + \00621 - \00629 + \00622 - \0062a + \00623 - \0062b + \00624 - \0062c + \00625 - \0062d + \00626 - \0062e + \00627 - \0062f + \00628 - \00630 + \00629 - \00631 + \0062a - \00632 + \0062b - \00633 + \0062c - \00634 + \0062d - \00635 + \0062e - \00636 + \0062f - \00637 + \00630 - \00638 + \00631 - \00639 + \00632 - \0063a + \00633 - \0063b + \00634 - \0063c + \00635 - \0063d + \00636 - \0063e + \00637 - \0063f + \00638 - \00640 + \00639 - \00641 + \0063a - \00642 + \0063b - \00643 + \0063c - \00644 + \0063d - \00645 + \0063e - \00646 + \0063f - \00647 + \00640 - \00648 + \00641 - \00649 + I-465 Ramp - \0064a + \00642 - \0064b + \00643 - \0064c + \00644 - \0064d + \00645 - \0064e + I-465 - \0064f + \00646 - \00650 + \00647 - \00651 + \00648 - \00652 + \00649 - \00653 + \0064a - \00654 + \0064b - \00655 + \0064c - \00656 + \0064d - \00657 + \0064e - \00658 + \0064f - \00659 + \00650 - \0065a + \00651 - \0065b + \00652 - \0065c + \00653 - \0065d + \00654 - \0065e + \00655 - \0065f + \00656 - \00660 + \00657 - \00661 + \00658 - \00662 + \00659 - \00663 + \0065a - \00664 + \0065b - \00665 + \0065c - \00666 + \0065d - \00667 + \0065e - \00668 + \0065f - \00669 + \00660 - \0066a + \00661 - \0066b + \00662 - \0066c + \00663 - \0066d + 86th St W Ramp - \0066e + \00664 - \0066f + \00665 - \00670 + 86th St W - \00671 + \00666 - \00672 + \00667 - \00673 + Northwest Blvd - \00674 + \00668 diff --git a/gpsbabel/saroute.c b/gpsbabel/saroute.c index b71fdffc8..a434ed05f 100644 --- a/gpsbabel/saroute.c +++ b/gpsbabel/saroute.c @@ -30,8 +30,11 @@ FILE *infile; char *turns_important = NULL; char *turns_only = NULL; +char *controls = NULL; char *split = NULL; +int control = 0; + static arglist_t saroute_args[] = { {"turns_important", &turns_important, @@ -41,6 +44,8 @@ arglist_t saroute_args[] = { NULL, ARGTYPE_BOOL }, {"split", &split, "Split into multiple routes at turns", NULL, ARGTYPE_BOOL }, + {"controls", &controls, "Read control points as waypoint/route/none", + "none", ARGTYPE_STRING }, {0, 0, 0, 0 } }; @@ -87,6 +92,17 @@ rd_init(const char *fname) fatal( MYNAME ": turns options are not compatible with split\n" ); } + if ( controls ) { + switch( controls[0] ) { + case 'n': control = 0; break; + case 'r': control = 1; break; + case 'w': control = 2; break; + default: + fatal( MYNAME + ": unrecognized value for 'controls'\n" ); + break; + } + } } static void @@ -114,6 +130,7 @@ my_read(void) route_head *track_head = NULL; route_head *old_track_head = NULL; waypoint *wpt_tmp; + char *routename = NULL; ReadShort(infile); /* magic */ version = ReadShort(infile); @@ -137,6 +154,11 @@ my_read(void) record = ReadRecord(infile, recsize); stringlen = le_read16((unsigned short *)(record + 0x1a)); + if ( stringlen ) { + routename = (char *)xmalloc( stringlen + 1 ); + routename[stringlen] = '\0'; + memcpy( routename, record+0x1c, stringlen ); + } Skip(infile, stringlen - 4); xfree(record); @@ -147,18 +169,24 @@ my_read(void) /* * here lie the route description records */ - if ( version < 6 ) { + if ( version < 6 || (control == 1)) { track_head = route_head_alloc(); route_add_head(track_head); + if ( control ) { + track_head->rte_name = xstrdup("control points"); + } + else { + track_head->rte_name = xstrdup( routename ); + } } count = ReadLong(infile); while (count) { ReadShort(infile); recsize = ReadLong(infile); - if (version < 6) { + if (version < 6 || control) { double lat; double lon; - + record = ReadRecord(infile, recsize); latlon = (struct ll *)(record); @@ -170,10 +198,40 @@ my_read(void) wpt_tmp = waypt_new(); wpt_tmp->latitude = lat; wpt_tmp->longitude = -lon; - wpt_tmp->shortname = (char *) xmalloc(7); - sprintf( wpt_tmp->shortname, "\\%5.5x", serial++ ); - route_add_wpt(track_head, wpt_tmp); + if ( control ) { + int addrlen = le_read16((short *) + (((char *)record)+18)); + int cmtlen = le_read16((short *) + (((char *)record)+20+addrlen)); + wpt_tmp->notes = (char *)xmalloc(cmtlen+1); + wpt_tmp->shortname = (char *)xmalloc(addrlen+1); + wpt_tmp->notes[cmtlen] = '\0'; + wpt_tmp->shortname[addrlen]='\0'; + memcpy(wpt_tmp->notes, + ((char *)record)+22+addrlen, + cmtlen ); + memcpy(wpt_tmp->shortname, + ((char *)record)+20, + addrlen ); + } + else { + wpt_tmp->shortname = (char *) xmalloc(7); + sprintf( wpt_tmp->shortname, "\\%5.5x", serial++ ); + } + if ( control == 2 ) { + waypt_add( wpt_tmp ); + } + else { + route_add_wpt(track_head, wpt_tmp); + } xfree(record); + if (version >= 6 ) { + /* + * two longs of scrap after each record, don't know why + */ + ReadLong(infile); + ReadLong(infile); + } } else { Skip(infile, recsize); /* @@ -213,6 +271,9 @@ my_read(void) if ( count ) { track_head = route_head_alloc(); route_add_head(track_head); + if ( routename && !split ) { + track_head->rte_name = xstrdup( routename ); + } } while (count) { old_track_head = NULL; @@ -257,11 +318,20 @@ my_read(void) wpt_tmp->latitude = lat; wpt_tmp->longitude = -lon; - wpt_tmp->shortname = (char *) xmalloc(7); + if ( stringlen && ((coordcount>1) || count)) { + wpt_tmp->shortname = xmalloc(stringlen+1); + wpt_tmp->shortname[stringlen] = '\0'; + memcpy( wpt_tmp->shortname, + ((char *)record)+2, + stringlen ); + } + else { + wpt_tmp->shortname = (char *) xmalloc(7); + sprintf( wpt_tmp->shortname, "\\%5.5x", + serial++ ); + } if ( turns_important && stringlen ) wpt_tmp->route_priority=1; - sprintf( wpt_tmp->shortname, "\\%5.5x", - serial++ ); if ( !turns_only || stringlen ) { route_add_wpt(track_head, wpt_tmp); if ( old_track_head ) { @@ -290,6 +360,9 @@ my_read(void) */ outercount--; } + if ( routename ) { + xfree( routename ); + } } -- 2.30.2